Remove zillions of unused local variables.

diff --git a/gpsbabel/arcdist.c b/gpsbabel/arcdist.c
index 2e21ae904d741b50620331df6166db7413dba17c..66aef4f21918b0fac946dbbdc89f8445bfa3c96d 100644 (file)
--- a/gpsbabel/arcdist.c
+++ b/gpsbabel/arcdist.c
@@ -165,9 +165,6 @@ arcdist_process(void)
        queue * elem, * tmp;
        waypoint * waypointp;
        double dist;
-       waypoint ** comp;
-       int i, wc;
-       queue temp_head;
        extra_data *ed;
         double lat1, lon1, lat2, lon2;
        int fileline = 0;

diff --git a/gpsbabel/copilot.c b/gpsbabel/copilot.c
index f36a321d67c21c10aa4d85c0768b27fdb6365755..bb98370aaae8b39ae6a6d91d87307d89c4b2f75c 100644 (file)
--- a/gpsbabel/copilot.c
+++ b/gpsbabel/copilot.c
@@ -183,8 +183,6 @@ copilot_writewpt(const waypoint *wpt)
 static void
 data_write(void)
 {
-       queue *elem, *tmp;
-
        if (NULL == (opdb = new_pdb())) { 
                fatal (MYNAME ": new_pdb failed\n");
        }

diff --git a/gpsbabel/easygps.c b/gpsbabel/easygps.c
index cb53059aeb606254a4ec393ab53ab8b863395363..533fc384c072f4cf65999918e10ec0c5d1c5f49a 100644 (file)
--- a/gpsbabel/easygps.c
+++ b/gpsbabel/easygps.c
@@ -105,7 +105,6 @@ data_read(void)
        double d;
        do {
                unsigned char tag;
-               unsigned char ilen;
                waypoint *wpt_tmp;
 
                wpt_tmp = xcalloc(sizeof(*wpt_tmp), 1);

diff --git a/gpsbabel/garmin.c b/gpsbabel/garmin.c
index 50f0b3c553edf7c877a01c976007d3412da3a9dc..b1c15607cc19c66d06a551f6afcc4468028b8a29 100644 (file)
--- a/gpsbabel/garmin.c
+++ b/gpsbabel/garmin.c
@@ -229,7 +229,6 @@ data_write(void)
                waypoint *wpt;
                char *ident;
                char *src = NULL;
-               char *wptname;
 
                wpt = (waypoint *) elem;
 

diff --git a/gpsbabel/gcdb.c b/gpsbabel/gcdb.c
index eb0c01a86a5a8834612ac7c836d643b949b46540..1d54eb0ce7814dd93d39c86c6247ec7ebfacbdab 100644 (file)
--- a/gpsbabel/gcdb.c
+++ b/gpsbabel/gcdb.c
@@ -92,7 +92,6 @@ wr_deinit(void)
 static void
 data_read(void)
 {
-       struct dbrec *rec;
        struct pdb *pdb;
        struct pdb_record *pdb_rec;
 
@@ -242,10 +241,7 @@ static void
 gcdb_write_wpt(const waypoint *wpt)
 {
        struct dbrec *rec;
-       char *vdata;
-       char *recdata;
        static int ct;
-       int length;
        int reclen;
        char tbuf[100];
 

diff --git a/gpsbabel/gpspilot.c b/gpsbabel/gpspilot.c
index 61362df275563f9daeafc9f3bb639dc1d7fc52e7..f494b3b3e335e9323ef41aebe24df07b076dcd12 100644 (file)
--- a/gpsbabel/gpspilot.c
+++ b/gpsbabel/gpspilot.c
@@ -228,8 +228,6 @@ gpspilot_writewpt(const waypoint *wpt)
 static void
 data_write(void)
 {
-       queue *elem, *tmp;
-
        if (NULL == (opdb = new_pdb())) { 
                fatal (MYNAME ": new_pdb failed\n");
        }

diff --git a/gpsbabel/magnav.c b/gpsbabel/magnav.c
index fbae0af40bb774b4cb515ff8cd7812230fd8142d..2788a36c88382259bdf56272afcd35691e132e20 100644 (file)
--- a/gpsbabel/magnav.c
+++ b/gpsbabel/magnav.c
@@ -224,8 +224,6 @@ my_writewpt(const waypoint *wpt)
 static void
 data_write(void)
 {
-       queue *elem, *tmp;
-
        static char *appinfo = 
                "\0\x01"
                "User\0\0\0\0\0\0\0\0\0\0\0\0"

diff --git a/gpsbabel/mapsend.c b/gpsbabel/mapsend.c
index 153af1d0ffbd6580694eb21ccf7eb71c34824a03..743506a3db9036c63e63166880f8895bafcd05b9 100644 (file)
--- a/gpsbabel/mapsend.c
+++ b/gpsbabel/mapsend.c
@@ -565,11 +565,9 @@ void mapsend_track_disp(const waypoint * wpt)
        unsigned char c;
        double dbl;
        int i;
-       unsigned int u;
        int t;
        int valid = 1;
        static int last_time;
-       static int centi;
 
        /*
         * Version 4.06 (at least) has a defect when it's set for .01km

diff --git a/gpsbabel/mkshort.c b/gpsbabel/mkshort.c
index c292bf00129f9cbb3ef5a22dba4af228aeb485bf..a6a87727dbcd3070e43550d3d748d55b45d4a3f1 100644 (file)
--- a/gpsbabel/mkshort.c
+++ b/gpsbabel/mkshort.c
@@ -130,7 +130,7 @@ mkshort_del_handle(void *h)
 
        if (hdr) {
                for (i = 0; i < PRIME; i++) {
-                       queue *e, *t, *z;
+                       queue *e, *t;
                        QUEUE_FOR_EACH(&hdr->namelist[i], e, t) {
                                uniq_shortname *s = (uniq_shortname *) e;
                                dequeue(e);

diff --git a/gpsbabel/pcx.c b/gpsbabel/pcx.c
index 5ba54d38fe517fcb744fd31d4fe4361fe8efaa08..6f8c96001d2660b752b80f1b9d6389d0595e3639 100644 (file)
--- a/gpsbabel/pcx.c
+++ b/gpsbabel/pcx.c
@@ -77,7 +77,6 @@ data_read(void)
        char latdir, londir;
        long alt; 
        int symnum;
-       char alttype;
        char date[10];
        char time[9];
        waypoint *wpt_tmp;

diff --git a/gpsbabel/polygon.c b/gpsbabel/polygon.c
index 411484386f02759cd30b7eb9b3d230baf091ee6d..4393e66987d2e3ca4b239c64c8165593a8dc7aed 100644 (file)
--- a/gpsbabel/polygon.c
+++ b/gpsbabel/polygon.c
@@ -187,9 +187,6 @@ polygon_process(void)
 {
        queue * elem, * tmp;
        waypoint * waypointp;
-       waypoint ** comp;
-       int i, wc;
-       queue temp_head;
        extra_data *ed;
         double lat1, lon1, lat2, lon2;
        double olat, olon;

diff --git a/gpsbabel/tpg.c b/gpsbabel/tpg.c
index ac62d1261968a1196f64da560ed022f2c102c781..3a081cec0fc449f0a7dcd7b7efea5ce52ef2928a 100644 (file)
--- a/gpsbabel/tpg.c
+++ b/gpsbabel/tpg.c
@@ -75,7 +75,7 @@ tpg_fread_double(FILE *fp)
                test_endianness();
        }
 
-       tpg_fread(buf, 1, 8, tpg_file_in);
+       tpg_fread(buf, 1, 8, fp);
        if (i_am_little_endian) {
                return *(double *) buf;
        }